merge trunk
authorKenichi Handa <handa@m17n.org>
Fri, 11 May 2012 12:43:46 +0000 (21:43 +0900)
committerKenichi Handa <handa@m17n.org>
Fri, 11 May 2012 12:43:46 +0000 (21:43 +0900)

Trivial merge